-
Notifications
You must be signed in to change notification settings - Fork 300
Webpack 5 upgrade #718
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Webpack 5 upgrade #718
Conversation
Used the following command:
```
find lib/ -name '*.scss' -exec npx sass-migrator module {} \;
```
|
I looked through this and besides the things I commented on, the things that are there looks good to me. Would love to get webpack 5 merged soon so Trivy can stop shouting about critical security vulnerabilities. |
|
Thanks @pjonsson those were good finds, I have fixed them. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Do we also need to bump the version in
Dockerfile?
|
package.json
Outdated
| "svg-sprite-loader": "^6.0.11", | ||
| "terriajs": "8.7.11", | ||
| "terriajs-cesium": "8.0.1", | ||
| "terriajs": "terriajs/terriajs#webpack5", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- replace now webpack5 is merged
|
@na9da #726 passed the CI before this change (but after the ESLint update), but I just rebased it and it now fails: |
| @import "~terriajs-variables"; | ||
| @import "~terriajs/lib/Sass/global/global"; | ||
| @use "../Styles/variables.scss"; | ||
| @use "~terriajs/lib/Sass/global/global"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@na9da The 0.3.0 release notes state the ~terriajs alias was replaced with relative paths. Is it the release note or this usage that is wrong?
There is also a usage of ~terriajs left in terriajs (TerriaJS/terriajs#7427).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good spot. I think I got the release notes wrong. It should be ~terriajs-mixins instead.
~terriajs imports style sheets from dependencies in node_modules. Use of tilde for imports is deprecated by sass-loader but still works. I'll remove them in the next release.
Fixes TerriaJS/terriajs#6998
Merge after TerriaJS/terriajs#7351